From a4cfaebb0b8fe128f2f86d97da5db1fb6de58d2b Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Wed, 9 Aug 2006 10:44:33 +0100
Subject: [PATCH] [XEN][IA64] IA64 build fixes after recent PER_CPU changes.
 Signed-off-by: Alex Williamson <alex.williamson@hp.com>

---
 xen/arch/ia64/xen/xensetup.c | 3 ++-
 xen/common/domain.c          | 1 +
 xen/common/timer.c           | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index eccc8bb349..a9f334f10f 100644
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -423,13 +423,14 @@ void start_kernel(void)
 	(xenheap_phys_end-__pa(heap_start)) >> 20,
 	(xenheap_phys_end-__pa(heap_start)) >> 10);
 
+    late_setup_arch(&cmdline);
+
     scheduler_init();
     idle_vcpu[0] = (struct vcpu*) ia64_r13;
     idle_domain = domain_create(IDLE_DOMAIN_ID);
     if ( (idle_domain == NULL) || (alloc_vcpu(idle_domain, 0, 0) == NULL) )
         BUG();
 
-    late_setup_arch(&cmdline);
     alloc_dom_xen_and_dom_io();
     setup_per_cpu_areas();
     mem_init();
diff --git a/xen/common/domain.c b/xen/common/domain.c
index ce779cb240..ef95ff5b2e 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -21,6 +21,7 @@
 #include <xen/hypercall.h>
 #include <xen/delay.h>
 #include <xen/shutdown.h>
+#include <xen/percpu.h>
 #include <asm/debugger.h>
 #include <public/dom0_ops.h>
 #include <public/sched.h>
diff --git a/xen/common/timer.c b/xen/common/timer.c
index e268f86ea9..526bb48959 100644
--- a/xen/common/timer.c
+++ b/xen/common/timer.c
@@ -17,6 +17,7 @@
 #include <xen/softirq.h>
 #include <xen/timer.h>
 #include <xen/keyhandler.h>
+#include <xen/percpu.h>
 #include <asm/system.h>
 #include <asm/desc.h>
 
-- 
2.30.2